From 61edf4093642e8be851595b42585c9b517422677 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sat, 19 Jul 2014 09:59:10 +0200 Subject: [PATCH] Adwaita: more progressbar shadows --- gtk/resources/theme/Adwaita/_common.scss | 26 +++++++++++++++---- .../theme/Adwaita/gtk-contained-dark.css | 23 +++++++++++----- gtk/resources/theme/Adwaita/gtk-contained.css | 20 +++++++++++--- 3 files changed, 54 insertions(+), 15 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 198c9092aa..4a37d0b037 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1001,16 +1001,22 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color,10%)); + box-shadow: inset 0 1px if($variant=='light', transparentize(white,0.7), + transparentize(white,0.85)), + 0 1px if($variant=='light', transparentize(black, 0.8), + transparentize(black,0.9)); &:selected { - @if $variant == 'light' { color: $selected_bg_color; } - @else { border-color: $selected_bg_color; } + @if $variant == 'light' { + color: $selected_bg_color; + box-shadow: none; + } + @else { box-shadow: inset 0 1px transparentize(white,0.95); } background-image: linear-gradient(to bottom, $base_color, darken($base_color,10%)); &:backdrop { @if $variant == 'light' { color: $selected_bg_color; } - @else { border-color: $selected_bg_color; } - background-image: none; + @else { border-color: $backdrop_base_color; } background-color: $backdrop_base_color; } } @@ -1018,6 +1024,7 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells @if $variant == 'light' { color: $backdrop_base_color; } @else { border-color: $backdrop_base_color; } background-image: none; + box-shadow: none; } } @@ -1829,7 +1836,16 @@ GtkProgressBar { border-radius: 3px; border-color: $selected_borders_color; background-color: $selected_bg_color; - box-shadow: none; + $_shadow: if($variant=='light', transparentize(black,0.7), + transparentize(black,0.9)); + box-shadow: 1px 0 $_shadow, -1px 0 $_shadow; + &.left { box-shadow: 1px 0 $_shadow; } + &.right { box-shadow: -1px 0 $_shadow; } + &.left.right { box-shadow: none; } + &.vertical { + box-shadow: 0 1px $_shadow; + &.bottom { box-shadow: none; } + } // box-shadow: inset 1px 1px transparentize($borders_edge,0.8); &:backdrop { border-color: $selected_bg_color; diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index f32932aaa3..e054b2f8a0 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -1124,17 +1124,18 @@ column-header .button, column-header .button:hover, column-header .button:active GtkTreeView.view.progressbar { border-radius: 4px; border-color: #0f2b48; - background-image: linear-gradient(to bottom, #215d9c, #184472); } + background-image: linear-gradient(to bottom, #215d9c, #184472); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), 0 1px rgba(0, 0, 0, 0.1); } GtkTreeView.view.progressbar:selected { - border-color: #215d9c; + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: linear-gradient(to bottom, #292929, #101010); } GtkTreeView.view.progressbar:selected:backdrop { - border-color: #215d9c; - background-image: none; + border-color: #2c2c2c; background-color: #2c2c2c; } GtkTreeView.view.progressbar:backdrop { border-color: #2c2c2c; - background-image: none; } + background-image: none; + box-shadow: none; } /********* * Menus * @@ -2341,7 +2342,17 @@ GtkProgressBar { border-radius: 3px; border-color: #0f2b48; background-color: #215d9c; - box-shadow: none; } + box-shadow: 1px 0 rgba(0, 0, 0, 0.1), -1px 0 rgba(0, 0, 0, 0.1); } + .progressbar.left { + box-shadow: 1px 0 rgba(0, 0, 0, 0.1); } + .progressbar.right { + box-shadow: -1px 0 rgba(0, 0, 0, 0.1); } + .progressbar.left.right { + box-shadow: none; } + .progressbar.vertical { + box-shadow: 0 1px rgba(0, 0, 0, 0.1); } + .progressbar.vertical.bottom { + box-shadow: none; } .progressbar:backdrop { border-color: #215d9c; background-color: #215d9c; diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 96ff7e77c6..76f133085b 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1117,17 +1117,19 @@ GtkTreeView.view.progressbar { color: white; border-radius: 4px; border-color: #184472; - background-image: linear-gradient(to bottom, #4a90d9, #2a76c6); } + background-image: linear-gradient(to bottom, #4a90d9, #2a76c6); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px rgba(0, 0, 0, 0.2); } GtkTreeView.view.progressbar:selected { color: #4a90d9; + box-shadow: none; background-image: linear-gradient(to bottom, white, #e6e6e6); } GtkTreeView.view.progressbar:selected:backdrop { color: #4a90d9; - background-image: none; background-color: #fcfcfc; } GtkTreeView.view.progressbar:backdrop { color: #fcfcfc; - background-image: none; } + background-image: none; + box-shadow: none; } /********* * Menus * @@ -2332,7 +2334,17 @@ GtkProgressBar { border-radius: 3px; border-color: #184472; background-color: #4a90d9; - box-shadow: none; } + box-shadow: 1px 0 rgba(0, 0, 0, 0.3), -1px 0 rgba(0, 0, 0, 0.3); } + .progressbar.left { + box-shadow: 1px 0 rgba(0, 0, 0, 0.3); } + .progressbar.right { + box-shadow: -1px 0 rgba(0, 0, 0, 0.3); } + .progressbar.left.right { + box-shadow: none; } + .progressbar.vertical { + box-shadow: 0 1px rgba(0, 0, 0, 0.3); } + .progressbar.vertical.bottom { + box-shadow: none; } .progressbar:backdrop { border-color: #4a90d9; background-color: #4a90d9; -- 2.30.2